projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44fd380 2dcac0c)
bitkeeper revision 1.788 (4051bcfbJsJbyDoBra1423PU9Gn1vA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 12 Mar 2004 13:36:59 +0000 (13:36 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 12 Mar 2004 13:36:59 +0000 (13:36 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/common/domain.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/common/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.